Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature: Plot Menu Highlighting #1181

Merged
merged 13 commits into from
Mar 23, 2024
Merged

Feature: Plot Menu Highlighting #1181

merged 13 commits into from
Mar 23, 2024

Conversation

ILike2WatchMemes
Copy link
Contributor

@ILike2WatchMemes ILike2WatchMemes commented Mar 15, 2024 •
edited by hannibal002
Loading

What

Added Plot Menu Highlighting Feature, highlights plots in the desk menu "Configure Plots" based on 4 different statuses:

  • has pests
  • has active spray
  • is plot player is currently in
  • is locked

Changelog New Features

  • Plot Menu Highlighting - ILike2WatchMemes
    • Plot highlighting based on plot statuses (pests, active spray, current plot, locked plot)

@hannibal002 hannibal002 added this to the Version 0.24 milestone Mar 15, 2024
@hannibal002 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Mar 15, 2024
@hannibal002 hannibal002 self-requested a review March 16, 2024 10:23
hannibal002
hannibal002 requested changes Mar 21, 2024
View reviewed changes
Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not tested in game, just code cleanup ideas

src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/inventory/PlotMenuHighlighting.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/inventory/PlotMenuHighlighting.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/inventory/PlotMenuHighlighting.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/inventory/PlotMenuHighlighting.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/inventory/PlotMenuHighlighting.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/inventory/PlotMenuHighlighting.kt Outdated Show resolved Hide resolved
@ILike2WatchMemes
Copy link
Contributor Author

not sure if this is out of scope for this pr (so please tell me if you prefer that we do this change in another pr later):

Move this plotMenuHighlighting, plotIcon and plotPrice all in one category "plot inventory"

(resolved convo for pull)

hannibal002
hannibal002 requested changes Mar 22, 2024
View reviewed changes
Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just a personal preference: move the events first, then the utils functions.

...ain/java/at/hannibal2/skyhanni/features/garden/inventory/plots/GardenPlotMenuHighlighting.kt Outdated Show resolved Hide resolved
...ain/java/at/hannibal2/skyhanni/features/garden/inventory/plots/GardenPlotMenuHighlighting.kt Outdated Show resolved Hide resolved
...ain/java/at/hannibal2/skyhanni/features/garden/inventory/plots/GardenPlotMenuHighlighting.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/config/features/garden/PlotMenuHighlightingConfig.java Outdated Show resolved Hide resolved
...ain/java/at/hannibal2/skyhanni/features/garden/inventory/plots/GardenPlotMenuHighlighting.kt Outdated Show resolved Hide resolved
...ain/java/at/hannibal2/skyhanni/features/garden/inventory/plots/GardenPlotMenuHighlighting.kt Outdated Show resolved Hide resolved
hannibal002
hannibal002 requested changes Mar 22, 2024
View reviewed changes
Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does work with plots, does not show the plot I'm standing on for me

...ain/java/at/hannibal2/skyhanni/features/garden/inventory/plots/GardenPlotMenuHighlighting.kt Outdated Show resolved Hide resolved
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Mar 23, 2024
@github-actions GitHub Actions
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Mar 23, 2024
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

hannibal002
hannibal002 approved these changes Mar 23, 2024
View reviewed changes
Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe add support for "currently pasting" in the future

@hannibal002 hannibal002 merged commit f307d45 into hannibal002:beta Mar 23, 2024
3 checks passed
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label Mar 23, 2024
@ILike2WatchMemes ILike2WatchMemes deleted the plot-menu-highlighting branch March 24, 2024 02:07
superhize pushed a commit to superhize/SkyHanni that referenced this pull request Apr 8, 2024
@ILike2WatchMemes @hannibal002 @superhize
Feature: Plot Menu Highlighting (hannibal002#1181)
4ee82be 
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hannibal002 hannibal002 hannibal002 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Version 0.24
Development

Successfully merging this pull request may close these issues.
2 participants
@ILike2WatchMemes @hannibal002